Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

model_split: Fixed #19236 - fixed error for abstract models with a split method #494

Merged
merged 2 commits into from Nov 4, 2012

Conversation

mrj0
Copy link
Contributor

@mrj0 mrj0 commented Nov 4, 2012

except AttributeError:
# If it doesn't have a split it's actually a model class

if isinstance(relation, basestring):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basestring isn't correct on python3, you want to use django.utils.six.string_types

@alex
Copy link
Member

alex commented Nov 4, 2012

Besides that one comment this is good to go!

alex added a commit that referenced this pull request Nov 4, 2012
model_split: Fixed #19236 - fixed error for abstract models with a split method
@alex alex merged commit 8d3f932 into django:master Nov 4, 2012
alex added a commit that referenced this pull request Nov 4, 2012
model_split: Fixed #19236 - fixed error for abstract models with a split method

Backport of 8d3f932
kmtracey added a commit that referenced this pull request Dec 21, 2015
…ets.

This includes the ability to collapse inlines by specifying a class named
'collapse'.
timgraham added a commit to timgraham/django that referenced this pull request Jan 11, 2016
timgraham added a commit to timgraham/django that referenced this pull request Jan 11, 2016
lwiecek pushed a commit to lwiecek/django that referenced this pull request Apr 14, 2016
…fieldsets.

This includes the ability to collapse inlines by specifying a class named
'collapse'.
lwiecek pushed a commit to lwiecek/django that referenced this pull request Apr 14, 2016
olivierdalang pushed a commit to olivierdalang/django that referenced this pull request Aug 10, 2016
Fixed django#494 -- Added ability to specify classes on admin inline fieldsets.

Conflicts:
	docs/releases/1.11.txt
olivierdalang pushed a commit to olivierdalang/django that referenced this pull request Dec 14, 2016
Fixed django#494 -- Added ability to specify classes on admin inline fieldsets.

Conflicts:
	docs/releases/1.11.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants